iOS Team / ScioLive · Commits

Commit 970d7db787a6021389ee9c9a81281f459db27238

Authored by yanglingyu
1 parent 83d5728b

问题1修改

Inline Side-by-side
Showing 5 changed files with 14 additions and 10 deletions
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
  View file @970d7db
... ... @@ -419,7 +419,7 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
419 419 _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
420 420 _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; // 自定义分页控件小圆标颜色
421 421 _cycleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:15];
422   - _cycleScrollView.titleLabelHeight = 50;
  422 + _cycleScrollView.titleLabelHeight = 40;
423 423 _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
424 424 _cycleScrollView.titleLabelTextColor = [UIColor whiteColor];
425 425 _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor];
... ...
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
  View file @970d7db
... ... @@ -415,7 +415,7 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
415 415 _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
416 416 _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; // 自定义分页控件小圆标颜色
417 417 _cycleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:15];
418   - _cycleScrollView.titleLabelHeight = 50;
  418 + _cycleScrollView.titleLabelHeight = 40;
419 419 _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
420 420 _cycleScrollView.titleLabelTextColor = [UIColor whiteColor];
421 421 _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor];
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
  View file @970d7db
... ... @@ -46,9 +46,13 @@
46 46 if(!(0 == [self->_dictionary[@"img"] length])){
47 47 NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:self->_dictionary[@"img"]]];
48 48 self->bgImg = [UIImage imageWithData:data];
49   - if (self.videoController && self->bgImg) {
50   - self.videoController.view.layer.contents=(__bridge id _Nullable)(self->bgImg.CGImage);
51   - }
  49 + dispatch_async(dispatch_get_main_queue(), ^{
  50 + if (self.videoController && self->bgImg) {
  51 + self.videoController.view.contentMode=UIViewContentModeScaleAspectFit;
  52 + [self.videoController.view setBackgroundColor:[UIColor colorWithPatternImage:self->bgImg]];
  53 +
  54 + }
  55 + });
52 56 }
53 57 });
54 58 }
... ... @@ -338,7 +342,7 @@
338 342 //增加播放器背景图片
339 343 if (!(nil==bgImg)) {
340 344 self.videoController.view.contentMode=UIViewContentModeScaleAspectFit;
341   - self.videoController.view.layer.contents=(__bridge id _Nullable)(bgImg.CGImage);
  345 + [self.videoController.view setBackgroundColor:[UIColor colorWithPatternImage:self->bgImg]];
342 346 }
343 347 self.liveController.delegate = self;
344 348 [self.videoController showInView:self.view];
... ...
CNLiveScioLive/Pages/Tools/SDCycleScrollView/SDCollectionViewCell.m
  View file @970d7db
... ... @@ -112,14 +112,14 @@
112 112 CGFloat titleLabelW = self.sd_width;
113 113 CGFloat titleLabelH = _titleLabelHeight;
114 114 CGFloat titleLabelX = 10;
115   - CGFloat titleLabelY = self.sd_height - titleLabelH-10;
  115 + CGFloat titleLabelY = self.sd_height - titleLabelH - 10;
116 116 _titleLabel.frame = CGRectMake(titleLabelX, titleLabelY, titleLabelW-2*titleLabelX, titleLabelH);
117   - _bgView.frame = CGRectMake(0, _titleLabel.sd_y, [UIScreen mainScreen].bounds.size.width, _titleLabel.sd_height + 20);
  117 + _bgView.frame = CGRectMake(0, _titleLabel.sd_y, [UIScreen mainScreen].bounds.size.width, _titleLabel.sd_height + 10);
118 118 }
119 119 }
120 120 - (void)setupTitleBgView
121 121 {
122   - _bgView = [[UIView alloc] initWithFrame:CGRectMake(0, _titleLabel.sd_y, [UIScreen mainScreen].bounds.size.width, _titleLabel.sd_height + 20)];
  122 + _bgView = [[UIView alloc] initWithFrame:CGRectMake(0, _titleLabel.sd_y, [UIScreen mainScreen].bounds.size.width, _titleLabel.sd_height + 10)];
123 123 _bgView.backgroundColor = [[UIColor blackColor]colorWithAlphaComponent:0.3];
124 124 [self.contentView addSubview:_bgView];
125 125 [self.contentView insertSubview:_bgView atIndex:1];
... ...
CNLiveScioLive/Pages/Tools/SDCycleScrollView/SDCycleScrollView.m
  View file @970d7db
... ... @@ -36,7 +36,7 @@
36 36 #import "SDWebImageManager.h"
37 37 #import "UIImageView+WebCache.h"
38 38  
39   -#define kCycleScrollViewInitialPageControlDotSize CGSizeMake(10, 10)
  39 +#define kCycleScrollViewInitialPageControlDotSize CGSizeMake(10, 0)
40 40  
41 41 NSString * const ID = @"SDCycleScrollViewCell";
42 42  
... ...