Commit ed13ea806832692066eefb44386e0d072bf12558
1 parent
0ecaf243
推送中英文
Showing
2 changed files
with
30 additions
and
4 deletions
CNLiveScioLive/AppDelegate.h
CNLiveScioLive/AppDelegate.m
| ... | ... | @@ -147,6 +147,7 @@ |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | }else if([self.window.rootViewController isKindOfClass:[UITabBarController class]]){ |
| 150 | + | |
| 150 | 151 | CNLiveENTabBarController *tabVC = (CNLiveENTabBarController *)self.window.rootViewController; |
| 151 | 152 | tabVC.selectedIndex = 0; |
| 152 | 153 | |
| ... | ... | @@ -283,10 +284,10 @@ |
| 283 | 284 | error:&err]; |
| 284 | 285 | NSDictionary *dic = dicData[@"program"]; |
| 285 | 286 | if(dic){ |
| 286 | - XLSlideMenu *menu = (XLSlideMenu *)self.window.rootViewController; | |
| 287 | - CNLiveTabBarController *tabVC = (CNLiveTabBarController *)menu.rootViewController; | |
| 288 | 287 | |
| 289 | - if([self.window.rootViewController isKindOfClass:[XLSlideMenu class]] && tabVC.childViewControllers.count > 0){ | |
| 288 | + if([self.window.rootViewController isKindOfClass:[XLSlideMenu class]]){ | |
| 289 | + XLSlideMenu *menu = (XLSlideMenu *)self.window.rootViewController; | |
| 290 | + CNLiveTabBarController *tabVC = (CNLiveTabBarController *)menu.rootViewController; | |
| 290 | 291 | UINavigationController *nav = tabVC.childViewControllers[0]; |
| 291 | 292 | |
| 292 | 293 | //判断推送消息是中文还是英文(初始化sdk配置) |
| ... | ... | @@ -309,6 +310,30 @@ |
| 309 | 310 | |
| 310 | 311 | } |
| 311 | 312 | |
| 313 | + }else if([self.window.rootViewController isKindOfClass:[UITabBarController class]]){ | |
| 314 | + | |
| 315 | + CNLiveENTabBarController *tabVC = (CNLiveENTabBarController *)self.window.rootViewController; | |
| 316 | + UINavigationController *nav = tabVC.childViewControllers[0]; | |
| 317 | + | |
| 318 | + //判断推送消息是中文还是英文(初始化sdk配置) | |
| 319 | + [self initializeSDKConfigurationByLanguage:self.language]; | |
| 320 | + | |
| 321 | + //视频 | |
| 322 | + if([@"program" isEqualToString:dic[@"type"]]){ | |
| 323 | + OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:dic]; | |
| 324 | + vc.title = dic[@"cmsColumnName"]; | |
| 325 | + vc.hidesBottomBarWhenPushed = YES; | |
| 326 | + [nav pushViewController:vc animated:YES]; | |
| 327 | + | |
| 328 | + } | |
| 329 | + //文本 | |
| 330 | + else if([@"article" isEqualToString:dic[@"type"]]){ | |
| 331 | + OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:dic]; | |
| 332 | + vc.title = dic[@"cmsColumnName"]; | |
| 333 | + vc.hidesBottomBarWhenPushed = YES; | |
| 334 | + [nav pushViewController:vc animated:YES]; | |
| 335 | + | |
| 336 | + } | |
| 312 | 337 | } |
| 313 | 338 | } |
| 314 | 339 | |
| ... | ... | @@ -377,8 +402,10 @@ |
| 377 | 402 | |
| 378 | 403 | self.type = arr.count == 2? arr[0] : str; |
| 379 | 404 | if(arr.count == 2&&[arr[1] isEqualToString:@"en"]){ |
| 405 | + //英文 | |
| 380 | 406 | self.language = NO; |
| 381 | 407 | }else{ |
| 408 | + //中文 | |
| 382 | 409 | self.language = YES; |
| 383 | 410 | |
| 384 | 411 | } | ... | ... |