Commit bc80834df6d8616c162da0275a0a061bbaac9fb3
1 parent
819e22a4
对完接口的版本
Showing
3 changed files
with
13 additions
and
5 deletions
LiveVideoCloud/LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
| @@ -10,10 +10,10 @@ | @@ -10,10 +10,10 @@ | ||
| 10 | #import "ZXNavigationController.h" | 10 | #import "ZXNavigationController.h" |
| 11 | #import "HomeViewController.h" | 11 | #import "HomeViewController.h" |
| 12 | #import "LVCLiveViewController.h" | 12 | #import "LVCLiveViewController.h" |
| 13 | -#import "LVCMyViewController.h" | 13 | +#import "LVCMineViewController.h" |
| 14 | #import "LVCTabBar.h" | 14 | #import "LVCTabBar.h" |
| 15 | 15 | ||
| 16 | -#import "JCMineViewController.h" | 16 | +#import "LVCMineViewController.h" |
| 17 | 17 | ||
| 18 | @interface ZXTabBarController ()<LVCTabBarDelegate> | 18 | @interface ZXTabBarController ()<LVCTabBarDelegate> |
| 19 | 19 | ||
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | { | 52 | { |
| 53 | [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"]; | 53 | [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"]; |
| 54 | // [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMyViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; | 54 | // [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMyViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; |
| 55 | - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[JCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; | 55 | + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | - (void)setupOneChildViewController:(UIViewController *)vc title:(NSString *)title image:(NSString *)image selectedImage:(NSString *)selectedImage | 58 | - (void)setupOneChildViewController:(UIViewController *)vc title:(NSString *)title image:(NSString *)image selectedImage:(NSString *)selectedImage |
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
| @@ -109,7 +109,10 @@ | @@ -109,7 +109,10 @@ | ||
| 109 | - (void)quitBtnClick { // 退出 | 109 | - (void)quitBtnClick { // 退出 |
| 110 | 110 | ||
| 111 | [_player stop]; | 111 | [_player stop]; |
| 112 | - [self.navigationController popViewControllerAnimated:YES]; | 112 | + if (self.navigationController.viewControllers.count > 2) { |
| 113 | + [self.navigationController popViewControllerAnimated:YES]; | ||
| 114 | + } | ||
| 115 | + | ||
| 113 | } | 116 | } |
| 114 | 117 | ||
| 115 | - (void)setModel:(LVCUGCLivePlayerModel *)model { | 118 | - (void)setModel:(LVCUGCLivePlayerModel *)model { |
| @@ -517,7 +520,7 @@ | @@ -517,7 +520,7 @@ | ||
| 517 | //3)用户点击done完成播放 | 520 | //3)用户点击done完成播放 |
| 518 | case MPMovieFinishReasonPlaybackError: | 521 | case MPMovieFinishReasonPlaybackError: |
| 519 | NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackError: %d\n", reason); | 522 | NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackError: %d\n", reason); |
| 520 | - [self toast:@"MPMovieFinishReasonPlaybackError"]; | 523 | + //[self toast:@"MPMovieFinishReasonPlaybackError"]; |
| 521 | break; | 524 | break; |
| 522 | 525 | ||
| 523 | default: | 526 | default: |
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.h
| @@ -11,4 +11,9 @@ | @@ -11,4 +11,9 @@ | ||
| 11 | @interface LiveLIstService : HttpService | 11 | @interface LiveLIstService : HttpService |
| 12 | + (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler; | 12 | + (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler; |
| 13 | 13 | ||
| 14 | ++ (NSString*)sha1:(NSString *)string; | ||
| 15 | + | ||
| 16 | + | ||
| 17 | ++ (NSString *)sortParameters:(NSDictionary*)parameters; | ||
| 18 | + | ||
| 14 | @end | 19 | @end |