iOS Team / ScioLive · Commits

Commit 70a7ae117b4f9e1538b219928e8013ac2d2cb352

Authored by yanglingyu
1 parent 17615649

不同型号轮播图标题阴影与文字上下边间距大小不同，减小阴影宽度 

阴影大小、文字大小写死处理
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
  View file @70a7ae1
@@ -418,8 +418,8 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell"; @@ -418,8 +418,8 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
418 _cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenWidth*9/16.0) delegate:self placeholderImage:[UIImage imageNamed:@"placeholder"]]; 418 _cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenWidth*9/16.0) delegate:self placeholderImage:[UIImage imageNamed:@"placeholder"]];
419 _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter; 419 _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
420 _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; // 自定义分页控件小圆标颜色 420 _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; // 自定义分页控件小圆标颜色
421 - _cycleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:15*MainHScale];  
422 - _cycleScrollView.titleLabelHeight = 50*MainHScale; 421 + _cycleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:15];
  422 + _cycleScrollView.titleLabelHeight = 50;
423 _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; 423 _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
424 _cycleScrollView.titleLabelTextColor = [UIColor whiteColor]; 424 _cycleScrollView.titleLabelTextColor = [UIColor whiteColor];
425 _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor]; 425 _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor];
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
  View file @70a7ae1
@@ -414,8 +414,8 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell"; @@ -414,8 +414,8 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
414 _cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenWidth*9/16.0) delegate:self placeholderImage:[UIImage imageNamed:@"placeholder"]]; 414 _cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenWidth*9/16.0) delegate:self placeholderImage:[UIImage imageNamed:@"placeholder"]];
415 _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter; 415 _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
416 _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; // 自定义分页控件小圆标颜色 416 _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; // 自定义分页控件小圆标颜色
417 - _cycleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:15*MainHScale];  
418 - _cycleScrollView.titleLabelHeight = 50*MainHScale; 417 + _cycleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:15];
  418 + _cycleScrollView.titleLabelHeight = 50;
419 _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; 419 _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
420 _cycleScrollView.titleLabelTextColor = [UIColor whiteColor]; 420 _cycleScrollView.titleLabelTextColor = [UIColor whiteColor];
421 _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor]; 421 _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor];
CNLiveScioLive/Pages/Tools/SDCycleScrollView/SDCollectionViewCell.m
  View file @70a7ae1
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 CGFloat titleLabelW = self.sd_width; 111 CGFloat titleLabelW = self.sd_width;
112 CGFloat titleLabelH = _titleLabelHeight; 112 CGFloat titleLabelH = _titleLabelHeight;
113 CGFloat titleLabelX = 10; 113 CGFloat titleLabelX = 10;
114 - CGFloat titleLabelY = self.sd_height - titleLabelH-20; 114 + CGFloat titleLabelY = self.sd_height - titleLabelH-10;
115 _titleLabel.frame = CGRectMake(titleLabelX, titleLabelY, titleLabelW-2*titleLabelX, titleLabelH); 115 _titleLabel.frame = CGRectMake(titleLabelX, titleLabelY, titleLabelW-2*titleLabelX, titleLabelH);
116 [self setupTitleBgView]; 116 [self setupTitleBgView];
117 } 117 }