iOS Team / ScioLive · Commits

Commit 25d1c24a26b118a4ef74baff3e730d3d9382775b

Authored by yanglingyu
1 parent ec14fb71

更换导航栏颜色图片

Inline Side-by-side
Showing 21 changed files with 25 additions and 11 deletions
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/571624858942_.pic_hd.jpg 0 → 100644
View file @25d1c24

2.4 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/Contents.json
  View file @25d1c24
1 { 1 {
2 "images" : [ 2 "images" : [
3 { 3 {
4 - "filename" : "cnlive_CN.png",  
5 "idiom" : "universal", 4 "idiom" : "universal",
6 "scale" : "1x" 5 "scale" : "1x"
7 }, 6 },
8 { 7 {
9 - "filename" : "cnlive_CN@2x.png", 8 + "filename" : "571624858942_.pic_hd.jpg",
10 "idiom" : "universal", 9 "idiom" : "universal",
11 "scale" : "2x" 10 "scale" : "2x"
12 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/cnlive_CN.png deleted 100644 → 0
View file @ec14fb7

703 Bytes
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/cnlive_CN@2x.png deleted 100644 → 0
View file @ec14fb7

1.4 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/581624858943_.pic_hd.jpg 0 → 100644
View file @25d1c24

2.05 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/Contents.json
  View file @25d1c24
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "cnlive_EN@2x.png", 8 + "filename" : "581624858943_.pic_hd.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/cnlive_EN@2x.png deleted 100755 → 0
View file @ec14fb7

881 Bytes
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/561624858942_.pic_hd.jpg 0 → 100644
View file @25d1c24

2.29 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/Contents.json
  View file @25d1c24
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "cnlive_blue_search@2x.png", 8 + "filename" : "561624858942_.pic_hd.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/cnlive_blue_search@2x.png deleted 100644 → 0
View file @ec14fb7

1.38 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/551624858942_.pic_hd.jpg 0 → 100644
View file @25d1c24

1.69 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/Contents.json
  View file @25d1c24
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "cnlive_classification@2x.png", 8 + "filename" : "551624858942_.pic_hd.jpg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/cnlive_classification@2x.png deleted 100755 → 0
View file @ec14fb7

202 Bytes
CNLiveScioLive/Assets.xcassets/common/cnlive_headerBack.imageset/Contents.json
  View file @25d1c24
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
8 - "filename" : "src=http---pic.soutu123.cn-element_origin_min_pic-16-12-15-1442592a1d29c69c2a2bb85e7692feed.jpg!-fw-700-quality-90-unsharp-true-compress-true&refer=http---pic.soutu123.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg.jpeg", 8 + "filename" : "WechatIMG8.jpeg",
9 "idiom" : "universal", 9 "idiom" : "universal",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
CNLiveScioLive/Assets.xcassets/common/cnlive_headerBack.imageset/WechatIMG8.jpeg 0 → 100644
View file @25d1c24

299 KB
CNLiveScioLive/Assets.xcassets/common/cnlive_headerBack.imageset/src=http---pic.soutu123.cn-element_origin_min_pic-16-12-15-1442592a1d29c69c2a2bb85e7692feed.jpg!-fw-700-quality-90-unsharp-true-compress-true&refer=http---pic.soutu123.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg.jpeg deleted 100644 → 0
View file @ec14fb7

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