iOS Team / LiveVideoCloud · Commits

Commit 03d2b370012861c589354af6699d79a134a26b32

Authored by 张旭
2 parents ec2c9d84 540814c7

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

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.m
  View file @03d2b37
... ... @@ -733,7 +733,8 @@
733 733 _viewThird = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)];
734 734 _viewThird.backgroundColor = [UIColor blackColor];
735 735 _thirdLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
736   - if (_index <= _playArray.count - 2 ) {
  736 + NSInteger arrayCount = _playArray.count;
  737 + if (_index <= (arrayCount - 2) ) {
737 738 [_thirdLoadView.bgImageView sd_setImageWithURL:[NSURL URLWithString:_playArray[_index+1].coverImgUrl] placeholderImage:_blurImage];
738 739 }
739 740 [_viewThird addSubview:_thirdLoadView];
... ...
LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLivePlayerCell.m
  View file @03d2b37
... ... @@ -39,7 +39,7 @@
39 39 self.contentView.backgroundColor = [UIColor whiteColor];
40 40 [self.contentView addSubview:self.iconView];
41 41 [self.contentView addSubview:self.nameLabel];
42   - [self.contentView addSubview:self.locationLabel];
  42 +// [self.contentView addSubview:self.locationLabel];
43 43 [self.contentView addSubview:self.countLabel];
44 44 [self.contentView addSubview:self.lookLabel];
45 45 [self.contentView addSubview:self.imageView];
... ... @@ -86,7 +86,7 @@
86 86 _stateLabel.text = @"已结束";
87 87 break;
88 88 case 4: // 已离线
89   - _stateLabel.text = @"已离线";
  89 + _stateLabel.text = @"回放";
90 90 break;
91 91  
92 92 default:
... ... @@ -109,8 +109,9 @@
109 109  
110 110 - (UILabel *)nameLabel {
111 111 if (!_nameLabel) {
112   - _nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(70, 15, SCREEN_WIDTH - 140, 20)];
  112 + _nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(70, 25, SCREEN_WIDTH - 140, 20)];
113 113 _nameLabel.text = @"这是我的昵称";
  114 + _nameLabel.font = [UIFont systemFontOfSize:20];
114 115 _nameLabel.textColor = [UIColor grayColor];
115 116 }
116 117 return _nameLabel;
... ...