iOS Team / ScioLive · Commits

Commit 133085f461fc06772acfac892413f989cc945125

Authored by yanglingyu
1 parent 11ed718d

头部去掉百年图片

Inline Side-by-side
Showing 19 changed files with 24 additions and 45 deletions
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/511624858680_.pic.jpg 0 → 100644
View file @133085f

1.4 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/571624858942_.pic_hd.jpg deleted 100644 → 0
View file @11ed718

2.4 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/Contents.json
  View file @133085f
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "571624858942_.pic_hd.jpg", 8 + "filename" : "511624858680_.pic.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/521624858689_.pic.jpg 0 → 100644
View file @133085f

881 Bytes
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/581624858943_.pic_hd.jpg deleted 100644 → 0
View file @11ed718

2.05 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/Contents.json
  View file @133085f
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "581624858943_.pic_hd.jpg", 8 + "filename" : "521624858689_.pic.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/491624858665_.pic.jpg 0 → 100644
View file @133085f

1.38 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/561624858942_.pic_hd.jpg deleted 100644 → 0
View file @11ed718

2.29 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/Contents.json
  View file @133085f
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "561624858942_.pic_hd.jpg", 8 + "filename" : "491624858665_.pic.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/501624858672_.pic.jpg 0 → 100644
View file @133085f

202 Bytes
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/551624858942_.pic_hd.jpg deleted 100644 → 0
View file @11ed718

1.69 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/Contents.json
  View file @133085f
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "551624858942_.pic_hd.jpg", 8 + "filename" : "501624858672_.pic.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/common/cnlive_headerBack.imageset/Contents.json deleted 100644 → 0
  View file @11ed718
1 -{  
2 - "images" : [  
3 - {  
4 - "idiom" : "universal",  
5 - "scale" : "1x"  
6 - },  
7 - {  
8 - "filename" : "WechatIMG8.jpeg",  
9 - "idiom" : "universal",  
10 - "scale" : "2x"  
11 - },  
12 - {  
13 - "idiom" : "universal",  
14 - "scale" : "3x"  
15 - }  
16 - ],  
17 - "info" : {  
18 - "author" : "xcode",  
19 - "version" : 1  
20 - }  
21 -}  
CNLiveScioLive/Assets.xcassets/common/cnlive_headerBack.imageset/WechatIMG8.jpeg deleted 100644 → 0
View file @11ed718

299 KB
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
  View file @133085f
@@ -187,10 +187,10 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell"; @@ -187,10 +187,10 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
187 -(void)viewWillAppear:(BOOL)animated 187 -(void)viewWillAppear:(BOOL)animated
188 { 188 {
189 [super viewWillAppear:animated]; 189 [super viewWillAppear:animated];
190 - UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];  
191 -  
192 - backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];  
193 - [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault]; 190 +// UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];
  191 +//
  192 +// backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];
  193 +// [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault];
194 } 194 }
195 -(void)viewWillDisappear:(BOOL)animated 195 -(void)viewWillDisappear:(BOOL)animated
196 { 196 {
CNLiveScioLive/Pages/Home/CNHomeViewController.m
  View file @133085f
@@ -152,10 +152,10 @@ @@ -152,10 +152,10 @@
152 152
153 #pragma mark - UI 153 #pragma mark - UI
154 - (void)setUpNavigationBar{ 154 - (void)setUpNavigationBar{
155 - UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];  
156 -  
157 - backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];  
158 - [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault]; 155 +// UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];
  156 +//
  157 +// backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];
  158 +// [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault];
159 //左 159 //左
160 UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 200, 44)]; 160 UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 200, 44)];
161 headerButton.userInteractionEnabled = NO; 161 headerButton.userInteractionEnabled = NO;
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
  View file @133085f
@@ -218,10 +218,10 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell"; @@ -218,10 +218,10 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell";
218 } 218 }
219 - (void)viewWillAppear:(BOOL)animated{ 219 - (void)viewWillAppear:(BOOL)animated{
220 [super viewWillAppear:animated]; 220 [super viewWillAppear:animated];
221 - UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];  
222 -  
223 - backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];  
224 - [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault]; 221 +// UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];
  222 +//
  223 +// backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];
  224 +// [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault];
225 //直播开始统计 225 //直播开始统计
226 [CNLiveStat statLivePlayerWithChannelId:@"zbsc"]; 226 [CNLiveStat statLivePlayerWithChannelId:@"zbsc"];
227 [CNLiveStat beginEvent:@"zbsc"]; 227 [CNLiveStat beginEvent:@"zbsc"];
CNLiveScioLive/Pages/My/CNMyViewController.m
  View file @133085f
@@ -34,10 +34,10 @@ static NSString *identifier = @"CNMyTableViewCell"; @@ -34,10 +34,10 @@ static NSString *identifier = @"CNMyTableViewCell";
34 -(void)viewWillAppear:(BOOL)animated 34 -(void)viewWillAppear:(BOOL)animated
35 { 35 {
36 [super viewWillAppear:animated]; 36 [super viewWillAppear:animated];
37 - UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];  
38 -  
39 - backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];  
40 - [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault]; 37 +// UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];
  38 +//
  39 +// backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];
  40 +// [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault];
41 } 41 }
42 - (void)viewDidLoad { 42 - (void)viewDidLoad {
43 [super viewDidLoad]; 43 [super viewDidLoad];
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
  View file @133085f
@@ -394,10 +394,10 @@ static const NSInteger margin = 34; @@ -394,10 +394,10 @@ static const NSInteger margin = 34;
394 394
395 - (void)viewWillAppear:(BOOL)animated { 395 - (void)viewWillAppear:(BOOL)animated {
396 [super viewWillAppear:animated]; 396 [super viewWillAppear:animated];
397 - UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];  
398 -  
399 - backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];  
400 - [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault]; 397 +// UIImage *backGroundImage = [UIImage imageNamed:@"cnlive_headerBack"];
  398 +//
  399 +// backGroundImage = [backGroundImage resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeStretch];
  400 +// [self.navigationController.navigationBar setBackgroundImage:backGroundImage forBarMetrics:UIBarMetricsDefault];
401 NSError *error = nil; 401 NSError *error = nil;
402 [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error: &error]; 402 [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error: &error];
403 [[AVAudioSession sharedInstance] setActive:YES error:nil]; 403 [[AVAudioSession sharedInstance] setActive:YES error:nil];