Commit 36b81c56549962c7bf5312740cd05398fd0996e7
1 parent
f5713e9d
no message
Showing
1 changed file
with
22 additions
and
4 deletions
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
| @@ -35,18 +35,21 @@ | @@ -35,18 +35,21 @@ | ||
| 35 | } | 35 | } |
| 36 | url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; | 36 | url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; |
| 37 | movieUrl = [NSURL URLWithString:url]; | 37 | movieUrl = [NSURL URLWithString:url]; |
| 38 | - | 38 | + videoHeight = MainScreenWidth * (9.0 / 16.0); |
| 39 | + | ||
| 39 | } else { | 40 | } else { |
| 40 | isPlay = NO; | 41 | isPlay = NO; |
| 42 | + videoHeight = MainScreenWidth * (9.0 / 16.0); | ||
| 43 | + | ||
| 41 | } | 44 | } |
| 42 | 45 | ||
| 43 | } else { | 46 | } else { |
| 44 | isPlay = NO; | 47 | isPlay = NO; |
| 45 | - | 48 | + videoHeight = 0; |
| 46 | } | 49 | } |
| 47 | 50 | ||
| 48 | NSLog(@"movieUrl -> %@",movieUrl); | 51 | NSLog(@"movieUrl -> %@",movieUrl); |
| 49 | - videoHeight = MainScreenWidth * (9.0 / 16.0); | 52 | +// videoHeight = MainScreenWidth * (9.0 / 16.0); |
| 50 | 53 | ||
| 51 | } | 54 | } |
| 52 | return self; | 55 | return self; |
| @@ -226,7 +229,22 @@ | @@ -226,7 +229,22 @@ | ||
| 226 | - (void)viewWillAppear:(BOOL)animated { | 229 | - (void)viewWillAppear:(BOOL)animated { |
| 227 | [super viewWillAppear:animated]; | 230 | [super viewWillAppear:animated]; |
| 228 | [[JGMusicManager shareMusicManager] playStop]; | 231 | [[JGMusicManager shareMusicManager] playStop]; |
| 229 | - [self.navigationController setNavigationBarHidden:YES]; | 232 | + if ([_dictionary[@"videoFlag"] isEqualToString:@"0"]) { |
| 233 | + self.navigationController.navigationBar.barTintColor = Color_Blue; | ||
| 234 | + self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]}; | ||
| 235 | + //左 | ||
| 236 | + UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 44)]; | ||
| 237 | + headerButton.layer.cornerRadius = 2.0; | ||
| 238 | + headerButton.layer.masksToBounds = true; | ||
| 239 | + [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal]; | ||
| 240 | + [headerButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside]; | ||
| 241 | + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton]; | ||
| 242 | + self.navigationItem.title = _dictionary[@"cmsColumnName"]; | ||
| 243 | + | ||
| 244 | + }else{ | ||
| 245 | + [self.navigationController setNavigationBarHidden:YES]; | ||
| 246 | + | ||
| 247 | + } | ||
| 230 | 248 | ||
| 231 | NSError *error = nil; | 249 | NSError *error = nil; |
| 232 | [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error]; | 250 | [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error]; |