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

Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
朱林
2 parents 26d467de f7f68bfc
Showing 23 changed files with 343 additions and 90 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/ComboCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentViewCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PriChatCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
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/LVCUGCLivePlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCBackgroundView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.m
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/left.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/left.imageset/left.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/right.imageset/Contents.json
@@ -191,6 +191,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 */; };
@@ -206,7 +207,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 */; };
@@ -628,6 +628,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; name = LVCUGCLiveListView.h; path = ../Controller/LVCUGCLiveListView.h; sourceTree = "<group>"; };
+		D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCUGCLiveListView.m; path = ../Controller/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>"; };
@@ -650,8 +652,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>"; };
@@ -1684,8 +1684,6 @@
 				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
 				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
 				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
-				D2CC7B851E891AA50034B8BF /* LVCUGCLiveListController.h */,
-				D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.m */,
 				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
 				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
 				81A483151E88BED00097A80A /* LVCTVLiveViewController.h */,
@@ -1719,6 +1717,8 @@
 				8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */,
 				81CE9E191E8CF567000F8F6B /* LVCRequestFailedView.h */,
 				81CE9E1A1E8CF567000F8F6B /* LVCRequestFailedView.m */,
+				D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
+				D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
 				D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
 				D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
 				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
@@ -1936,6 +1936,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 */,
@@ -2069,7 +2070,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 */,
@@ -44,7 +44,8 @@
      */
     // 20170327 20170328
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170311" name:@"zzllzzzll" portrait:@"https://y3.cnliveimg.com/mobile/images/mobilehead/2017/03/30/1490844962259_small.jpg"];
+
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170328" portrait:@""];
     [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
         NSLog(@"连接服务器-----success");
@@ -35,7 +35,7 @@
     //如果计算过高度,直接返回
     if (_priCellHeight) return _priCellHeight;
-    _priCellHeight = 10;
+    _priCellHeight = 30;
     NSString *content = self.content;
     //文字
     CGFloat textMaxW = self.priCellWidth;
@@ -11,7 +11,7 @@
 @interface ComboCell ()
-@property (nonatomic ,strong) UIView *      _Nullable bgView;
+@property (nonatomic ,strong) UIImageView *      _Nullable bgView;
 @property (nonatomic ,strong) UIImageView * _Nullable icon;
 @property (nonatomic ,strong) UILabel *     _Nullable senderNameLbl;
 @property (nonatomic ,strong) UILabel *     _Nullable giftNameLbl;
@@ -43,6 +43,7 @@
     self.senderNameLbl.size = [self.senderNameLbl labelSize];
     self.giftNameLbl.size = [self.giftNameLbl labelSize];
     self.bgView.frame = CGRectMake(0, 0, self.width, self.height);
+    self.bgView.image = [UIImage imageNamed:@"背景220x40"];
     self.bgView.layer.cornerRadius = self.height * 0.5;
     self.giftImage.frame = CGRectMake(self.width - self.height, 0, self.height, self.height);
     self.giftImage.image = [UIImage imageNamed:model.giftImageName];
@@ -68,7 +69,7 @@
     {
         _senderNameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, 0, 100, 20)];
         _senderNameLbl.font = [UIFont systemFontOfSize:kContentFont];
-        _senderNameLbl.textColor = [UIColor blackColor];
+        _senderNameLbl.textColor = [UIColor whiteColor];
     }
     return _senderNameLbl;
 }
@@ -79,7 +80,7 @@
     {
         _giftNameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, self.senderNameLbl.bottom , 100, 20)];
         _giftNameLbl.font = [UIFont systemFontOfSize:kContentFont];
-        _giftNameLbl.textColor = [UIColor blackColor];
+        _giftNameLbl.textColor = [UIColor yellowColorZX];
     }
     return _giftNameLbl;
 }
@@ -91,9 +92,8 @@
         _icon = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
         _icon.clipsToBounds     = YES;
         _icon.layer.cornerRadius = 20;
-        _icon.layer.borderWidth = 1;
-        _icon.layer.borderColor = [UIColor cyanColor].CGColor;
-
+//        _icon.layer.borderWidth = 1;
+//        _icon.layer.borderColor = [UIColor cyanColor].CGColor;
     }
     return _icon;
 }
@@ -107,13 +107,13 @@
     return _giftImage;
 }
-- (UIView *)bgView
+- (UIImageView *)bgView
 {
     if (!_bgView)
     {
-        _bgView = [[UIView alloc] init];
-        _bgView.backgroundColor = [UIColor yellowColor];
+        _bgView = [[UIImageView alloc] init];
         _bgView.clipsToBounds   = YES;
+        _bgView.alpha = 0.4;
     }
     return _bgView;
 }
@@ -72,8 +72,8 @@
 {
     PresentLable *lable   = [[PresentLable alloc] init];
     lable.backgroundColor = [UIColor clearColor];
-    lable.borderColor     = [UIColor yellowColor];
-    lable.textColor       = [UIColor greenColor];
+    lable.borderColor     = [UIColor orangeColor];
+    lable.textColor       = [UIColor yellowColor];
     lable.font            = [UIFont systemFontOfSize:17.0];
     lable.textAlignment   = NSTextAlignmentCenter;
     lable.alpha           = 0.0;
@@ -253,7 +253,7 @@
     [UIView animateKeyframesWithDuration:interval delay:0 options:0 animations:^{
         [UIView addKeyframeWithRelativeStartTime:0 relativeDuration:1/2.0 animations:^{
-            self.transform = CGAffineTransformMakeScale(4, 4);
+            self.transform = CGAffineTransformMakeScale(2.5, 2.5);
         }];
         [UIView addKeyframeWithRelativeStartTime:1/2.0 relativeDuration:1/2.0 animations:^{
             self.transform = CGAffineTransformMakeScale(0.8, 0.8);
@@ -7,8 +7,10 @@
 //
 #import "BaseView.h"
+#import "AnimationBaseView.h"
+
 @class PresentView;
-@class AnimationBaseView;
+//@class AnimationBaseView;
 typedef NS_ENUM(NSInteger, BounceBtnType) {//弹窗按钮类型
     BounceBtnTypeAite        = 1,//@TA按钮点击
@@ -22,10 +24,11 @@ typedef NS_ENUM(NSInteger, JumpControllerType) {//跳转控制器类型
 };
 @interface LiveBaseView : BaseView 
+@property (nonatomic ,strong           ) UIButton *       _Nullable closeBtn;
 @property (nonatomic) JumpControllerType              jumpType;
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
-@property (nonatomic ,strong ,readonly) AnimationBaseView * _Nullable             animationBaseView;
+@property (nonatomic ,strong) AnimationBaseView * _Nullable             animationBaseView;
 + (instancetype _Nullable)liveBaseView;
@@ -21,7 +21,6 @@
 #import "userInfoModel.h"
 #import "PrivateView.h"
 #import "ChatBarrageView.h"
-#import "AnimationBaseView.h"
 #define BottomToolHeight 60
@@ -37,9 +36,9 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate,PopViewDelegate>
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
-@property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
+//@property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
 @property (nonatomic ,strong           ) BottomToolView*  _Nullable bottomToolView;
-@property (nonatomic ,strong           ) UIButton *       _Nullable closeBtn;
+
 @property (nonatomic ,strong           ) GiftListView *   _Nullable giftListView;
 @property (nonatomic ,weak             ) UIView *         _Nullable giftPopView;
 @property (nonatomic ,strong ,readwrite) PresentView *    _Nullable presentView;//连击View
@@ -720,7 +719,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         closeBtn.frame = CGRectMake(SCREEN_WIDTH - 43,SCREEN_HEIGHT - self.bottomToolView.height + (self.bottomToolView.height - 33)*0.5, 33, 33);
         [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseNormal"] forState:UIControlStateNormal];
         [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseTouch"] forState:UIControlStateHighlighted];
-        [closeBtn addTarget:self action:@selector(closeAction) forControlEvents:UIControlEventTouchUpInside];
         _closeBtn = closeBtn;
     }
     return _closeBtn;
@@ -14,6 +14,7 @@
 @interface PriChatCell ()
 @property (nonatomic ,strong) chatMsgModel * _Nullable model;
+@property (nonatomic ,strong) UIImageView * _Nullable             bgImgView;
 @property (nonatomic ,strong) UIImageView *  _Nullable icon;
 @property (nonatomic ,strong) UILabel *      _Nullable content;
@@ -36,51 +37,67 @@
     _model = model;
     [self bindView];
     [self.icon sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
+    self.icon.backgroundColor = [UIColor greenColor];
     self.content.text = model.content;
     CGSize size = [self.content labelSizeWithWidth:_model.priCellWidth];
+
     if (_model.isMine) {
-        if (_model.priCellHeight < 37) {//1行 // 36.7
-            
-            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 2.5, size.width, size.height);//self.height - 5
+        if (_model.priCellHeight < 57) {//1行 // 36.7
+            self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
+            self.icon.centerY = (self.height - 25)*0.5 + 12.5;
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 20 - 25, 2.5, size.width, size.height);
             self.content.textAlignment = NSTextAlignmentRight;
-            self.content.centerY = self.icon.centerY;
+            self.content.centerY = self.height * 0.5;
+            self.bgImgView.frame = CGRectMake(self.content.left - 15, self.content.top - 10, self.content.width + 45, self.content.height + 20);
         }else
         {
-            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 10, size.width, size.height);//self.height - 5
+            self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
+            self.icon.centerY = (self.height - 25)*0.5 + 12.5;
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 20 - 25, 10, size.width, size.height);
             self.content.textAlignment = NSTextAlignmentLeft;
+            self.content.centerY = self.height * 0.5;
+            self.bgImgView.frame = CGRectMake(self.content.left - 15, self.content.top - 10, self.content.width + 50, self.content.height + 20);
         }
+        
+        self.bgImgView.image = [[UIImage imageNamed:@"right"]stretchableImageWithLeftCapWidth:167 topCapHeight:100];
     }else
     {
-         if (_model.priCellHeight < 37) {//1行
+         if (_model.priCellHeight < 57) {//1行
              self.icon.frame = CGRectMake(5, 6, 25, 25);
              self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
-             self.content.frame = CGRectMake(5 + 30 + 10, 2.5, size.width, size.height);//self.height - 5
+             self.content.frame = CGRectMake(5 + 25 + 35, 2.5, size.width, size.height);
              self.content.textAlignment = NSTextAlignmentLeft;
              self.content.centerY = self.icon.centerY;
+             self.bgImgView.frame = CGRectMake(self.content.left - 25, self.content.top - 10, self.content.width + 45, self.content.height + 20);
          }else
          {
              self.icon.frame = CGRectMake(5, 6, 25, 25);
              self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
-             self.content.frame = CGRectMake(5 + 30 + 10, 10, size.width, size.height);//self.height - 5
+             self.content.frame = CGRectMake(5 + 25 + 35 + 15, 10, size.width, size.height);
              self.content.textAlignment = NSTextAlignmentLeft;
+             self.content.centerY = self.height * 0.5;
+             self.bgImgView.frame = CGRectMake(self.content.left - 35 - 5, self.content.top - 10, self.content.width + 50, self.content.height + 20);
          }
+        
+        self.bgImgView.image = [[UIImage imageNamed:@"left"] stretchableImageWithLeftCapWidth:189 topCapHeight:164];
+
     }
+    _icon.layer.cornerRadius = _icon.height * 0.5;
+    [self sendSubviewToBack:self.bgImgView];
 }
 - (void)bindView
 {
     if (_model.isMine) {
         self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
-        NSLog(@"self.icon.centerY%f,%f",self.height * 0.5,_model.priCellHeight);//13.353516 21.707031 155.363281
+//        NSLog(@"self.icon.centerY%f,%f",self.height * 0.5,_model.priCellHeight);//13.353516 21.707031 155.363281
         self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
         self.content.frame = CGRectMake(self.width - 30 - CHAT_POP_WIDTH, 2.5, CHAT_POP_WIDTH - 10, self.height - 5);
-        self.content.backgroundColor = [UIColor blueColorZX];
     }else{
         self.icon.frame = CGRectMake(5, 6, 25, 25);
         self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
         self.content.frame = CGRectMake(5 + 30, 2.5, CHAT_POP_WIDTH, self.height - 5);
-        self.content.backgroundColor = [UIColor greenColor];
     }
 }
@@ -105,12 +122,22 @@
     {
         _icon = [[UIImageView alloc] init];
         _icon.layer.masksToBounds = YES;
-        _icon.layer.cornerRadius = 15.f;
         [self addSubview:_icon];
     }
     return _icon;
 }
+- (UIImageView * _Nullable)bgImgView
+{
+    if (!_bgImgView)
+    {
+        _bgImgView = [[UIImageView alloc] init];
+
+        [self addSubview:_bgImgView];
+    }
+    return _bgImgView;
+}
+
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
@@ -80,7 +80,6 @@ static NSString *message_content = @&quot;message_content&quot;;
             self.top = SCREEN_HEIGHT - newFrameKeyboard.size.height - self.height;
         }];
         self.isEditing = YES;
-        NSLog(@"showtop:%f",self.top);
     }
 }
@@ -91,7 +90,6 @@ static NSString *message_content = @&quot;message_content&quot;;
         [UIView animateWithDuration:0.1 animations:^{
             self.top = SCREEN_HEIGHT - 300;
         }];
-        NSLog(@"hiddentop:%f",self.top);
         self.isEditing = NO;
     }
 }
@@ -104,7 +102,7 @@ static NSString *message_content = @&quot;message_content&quot;;
         NSDictionary *dic = @{message_content:textField.text};
         weakself
         NSString *message = [Tools dictionaryToJson:dic];
-        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"20170327" success:^(CNLiveChatMessage *message) {
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"20170328" success:^(CNLiveChatMessage *message) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 strongself
@@ -256,7 +254,8 @@ static NSString *message_content = @&quot;message_content&quot;;
     if (!_textField)
     {
         _textField = [[UITextField alloc] initWithFrame:CGRectMake(4, 4, self.bottomTool.width - self.sendBtn.width - 8, self.bottomTool.height - 8)];
-        _textField.borderStyle = UITextBorderStyleLine;
+        _textField.borderStyle = UITextBorderStyleNone;
+        _textField.placeholder = @"和主播说点什么吧";
         _textField.returnKeyType       = UIReturnKeySend;
         _textField.delegate = self;
     }
@@ -58,12 +58,14 @@
     [self.view addSubview:self.filterView];
     // 初始化推流
-    NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
+    NSInteger time = [[NSDate date] timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    NSString *random = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
+    NSString *activityId = [NSString stringWithFormat:@"%@%@",timeString,random];
     _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
-    //        _kitCN.activityName = @"iOS test";
-    //        _kitCN.coverImgUrl = @"djfiwooa";
+    _kitCN.coverImgUrl =  @"https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=3269891096,90190857&fm=23&gp=0.jpg";
     // 设置推流配置
     [self setStreamerCfg];
@@ -114,6 +116,7 @@
         _liveBaseView.jumpType = JumpControllerTypePresent;
         _liveBaseView.viewController = self;
         _liveBaseView.backgroundColor = [UIColor clearColor];
+        [_liveBaseView.closeBtn addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _liveBaseView;
 }
@@ -121,17 +124,32 @@
 #pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)startCapture:(UIButton *)button {   // 开始推流
-    [_quitButton removeFromSuperview];
+    // 设置标题
+    if (_prepareView.titleTextField.text) {
+        _kitCN.activityName = _prepareView.titleTextField.text;
+    } else {
+        _kitCN.activityName = @"无名";
+    }
-    _isStreaming = YES;
+    [_openFilterButton removeFromSuperview];
+    [_changeCameraButton removeFromSuperview];
+    [_openFlashButton removeFromSuperview];
+    _openFilterButton = nil;
+    _changeCameraButton = nil;
+    _openFlashButton = nil;
     [_prepareView removeFromSuperview];
     [_kitCN startStream:^{
         NSLog(@"开启推流成功 ------- success");
+        _isStreaming = YES;
+        [_quitButton removeFromSuperview];
         [self.view insertSubview:self.liveBaseView atIndex:1];
-
+        [self.liveBaseView.animationBaseView addSubview:self.openFilterButton];
+        [self.liveBaseView.animationBaseView addSubview:self.changeCameraButton];
+        [self.liveBaseView.animationBaseView addSubview:self.openFlashButton];
+        
     } failure:^(NSDictionary *errorDic) {
         //NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
         NSLog(@"%@",errorDic);
@@ -11,10 +11,10 @@
 #import "LVCLivePlayerController.h"
 #import "LVCUGCLivePlayerController.h"
 #import "LVCTVLiveViewController.h"
-#import "LVCUGCLiveListController.h"
 #import "V8HorizontalPickerView.h"
 #import "MHPagingScrollView.h"
 #import "LVCTelevisionView.h"
+#import "LVCUGCLiveListView.h"
 @interface HomeViewController ()<V8HorizontalPickerViewDataSource, V8HorizontalPickerViewDelegate,MHPagingScrollViewDelegate,UIScrollViewDelegate>
 {
@@ -54,7 +54,7 @@
     [UGCLiveListBtn addTarget:self action:@selector(UGCLiveListAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:UGCLiveListBtn];
-    _titleArr = @[@"推荐",@"频道"];
+    _titleArr = @[@"直播",@"推荐",@"频道"];
     CGFloat width = 0;
     for (NSString *title in _titleArr) {
         CGSize size = [title sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
@@ -90,8 +90,7 @@
 - (void)UGCLiveListAction
 {
-    LVCUGCLiveListController *listVC = [[LVCUGCLiveListController alloc] init];
-    [self.navigationController pushViewController:listVC animated:YES];
+    
 }
 #pragma mark - V8HorizontalPickerViewDataSource
@@ -167,6 +166,13 @@
             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)];
+        }
+        return liveListView;
     }
     return nil;
 }
 //
-//  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"
+#import "LVCUGCLivePlayerController.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 +56,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 +69,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 {
@@ -65,12 +78,18 @@ static NSString *cellId = @&quot;cellId&quot;;
     NSLog(@"cell ------> %@",cell);
-    LVCUGCLivePlayerModel *model = [[LVCUGCLivePlayerModel alloc] init];
+    LVCUGCLivePlayerModel *model = _arrayM[indexPath.row];
     cell.model = model;
     return cell;
 }
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    LVCUGCLivePlayerController *player = [[LVCUGCLivePlayerController alloc] init];
+    [self.viewController.navigationController pushViewController:player animated:YES];
+}
+
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (UICollectionView *)collectionView {
@@ -78,8 +97,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 + 100);
+        _collectionView = [[UICollectionView alloc] initWithFrame:self.bounds collectionViewLayout:layout];
         _collectionView.backgroundColor = [UIColor lightGrayColor];
         _collectionView.showsHorizontalScrollIndicator = NO;
         _collectionView.dataSource = self;
@@ -89,9 +108,5 @@ static NSString *cellId = @&quot;cellId&quot;;
     return _collectionView;
 }
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
 @end
@@ -83,7 +83,7 @@
                                                                  }];
-    //[self.view addSubview:self.bgView];
+    [self.view addSubview:self.bgView];
 }
 #pragma mark - UIPanGestureRecognizer !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -168,7 +168,6 @@
                     // 停止后的视图,拿到自己的加载图来显示
                     [_viewSecond addSubview:_secondLoadView];
-                    [_viewSecond removeGestureRecognizer:_pan];
                     _viewOne.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
                     _tempView = _viewOne;
                     _viewOne = _viewSecond;
@@ -267,9 +266,11 @@
             NSLog(@"loadStateDidChange: MPMovieLoadStatePlaythroughOK: %d\n", (int)loadState);
         } else if ((loadState & MPMovieLoadStateStalled) != 0) {
+            
             NSLog(@"loadStateDidChange: MPMovieLoadStateStalled: %d\n", (int)loadState);
         } else {
+            
             NSLog(@"loadStateDidChange: ???: %d\n", (int)loadState);
         }
     }
@@ -370,7 +371,7 @@
     if (_player.anchorStatus == 2) {  // 已结束
     }
-    //    _bgView.anchorStatus = _player.anchorStatus;
+    _bgView.anchorStatus = _player.anchorStatus;
 }
@@ -379,12 +380,19 @@
 }
+#pragma mark - Button Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)backToList {
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (LVCUGCBackgroundView *)bgView {
     if (!_bgView) {
         _bgView = [[LVCUGCBackgroundView alloc] initWithFrame:self.view.bounds];
         _bgView.hidden = YES;
+        [_bgView.backButton addTarget:self action:@selector(backToList) forControlEvents:UIControlEventTouchUpInside];
     }
     return _bgView;
 }
@@ -392,7 +400,7 @@
 - (UIView *)viewOne {
     if (!_viewOne) {
         _viewOne = [[UIView alloc] initWithFrame:CGRectMake(0, -SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)];
-        _viewOne.backgroundColor = [UIColor orangeColor];
+        _viewOne.backgroundColor = [UIColor blackColor];
         _firstLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
         [_viewOne addSubview:_firstLoadView];
         _oneY = -SCREEN_HEIGHT;
@@ -403,7 +411,7 @@
 - (UIView *)viewSecond {
     if (!_viewSecond) {
         _viewSecond = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
-        _viewSecond.backgroundColor = [UIColor redColor];
+        _viewSecond.backgroundColor = [UIColor blackColor];
         _secondLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
         [_viewSecond addSubview:_secondLoadView];
         _SecondY = 0;
@@ -414,7 +422,7 @@
 - (UIView *)viewThird {
     if (!_viewThird) {
         _viewThird = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)];
-        _viewThird.backgroundColor = [UIColor blueColor];
+        _viewThird.backgroundColor = [UIColor blackColor];
         _thirdLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
         [_viewThird addSubview:_thirdLoadView];
         _ThirdY = SCREEN_HEIGHT;
@@ -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"];
@@ -57,8 +57,7 @@
     }
 }
-#pragma mark - getter !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (UIImageView *)iconView {
     if (!_iconView) {
@@ -8,14 +8,40 @@
 #import "LVCUGCLivePlayerCell.h"
+@interface LVCUGCLivePlayerCell()
+
+@property (nonatomic, strong) UIImageView *iconView;
+
+@property (nonatomic, strong) UILabel *nameLabel;
+
+@property (nonatomic, strong) UILabel *locationLabel;
+
+@property (nonatomic, strong) UILabel *countLabel;
+
+@property (nonatomic, strong) UILabel *lookLabel;
+
+@property (nonatomic, strong) UIImageView *imageView;
+
+@property (nonatomic, strong) UILabel *stateLabel;
+
+@property (nonatomic, strong) UILabel *titleLabel;
+
+@end
+
 @implementation LVCUGCLivePlayerCell
-- (instancetype)initWithFrame:(CGRect)frame
-{
+- (instancetype)initWithFrame:(CGRect)frame {
+    
     self = [super initWithFrame:frame];
     if (self) {
         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];
+        [self.contentView addSubview:self.titleLabel];
     }
     return self;
 }
@@ -26,9 +52,99 @@
     if (_model != model) {
         _model = model;
     }
+    _titleLabel.text = model.activityName;
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"timg" ofType:@"jpeg"];
+    UIImage *image = [UIImage imageWithContentsOfFile:path];
+    [_imageView sd_setImageWithURL:[NSURL URLWithString:model.coverImgUrl] placeholderImage:image];
 }
 #pragma mark - SetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (UIImageView *)iconView {
+    
+    if (!_iconView) {
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        _iconView = [[UIImageView alloc] initWithImage:image];
+        _iconView.frame = CGRectMake(10, 10, 50, 50);
+        _iconView.layer.cornerRadius = 25;
+        _iconView.layer.masksToBounds = YES;
+    }
+    return _iconView;
+}
+
+- (UILabel *)nameLabel {
+    if (!_nameLabel) {
+        _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) {
+        _imageView = [[UIImageView alloc] init];
+        _imageView.frame = CGRectMake(0, 70, SCREEN_WIDTH, SCREEN_WIDTH);
+        _imageView.contentMode = UIViewContentModeScaleAspectFill;
+        _imageView.clipsToBounds = YES;
+        [_imageView addSubview:self.stateLabel];
+    }
+    return _imageView;
+}
+
+- (UILabel *)stateLabel {
+    if (!_stateLabel) {
+        _stateLabel = [[UILabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - 70, 10, 60, 20)];
+        _stateLabel.font = [UIFont systemFontOfSize:13];
+        _stateLabel.textAlignment = NSTextAlignmentCenter;
+        _stateLabel.textColor = [UIColor whiteColor];
+        _stateLabel.layer.cornerRadius = 10;
+        _stateLabel.layer.masksToBounds = YES;
+        _stateLabel.text = @"直播";
+        _stateLabel.layer.borderColor = [UIColor whiteColor].CGColor;
+        _stateLabel.layer.borderWidth = 1;
+    }
+    return _stateLabel;
+}
+
+- (UILabel *)titleLabel {
+    if (!_titleLabel) {
+        _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(5, SCREEN_WIDTH + 75, SCREEN_WIDTH, 20)];
+        _titleLabel.textColor = [UIColor grayColor];
+        _titleLabel.text = @"这是一个标题";
+    }
+    return _titleLabel;
+}
 @end
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "left.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "right.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "背景220x40.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file