iOS Team / CNLiveVideoClassifyKit · Commits

Commit 6cd49839d9080bbd09b6f0e1e49667e9fed16e8e

Authored by yanglingyu
1 parent aead4dce

交互关系

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
  View file @6cd4983
... ... @@ -14,7 +14,6 @@
14 14  
15 15 - (void)viewDidLoad {
16 16 [super viewDidLoad];
17   - self.navigationController.navigationBarHidden = YES;
18 17 [self.view addSubview: self.categoryView];
19 18 [self addChildViewController:self.pageViewController];
20 19 [self.view addSubview:self.pageViewController.view];
... ... @@ -33,6 +32,7 @@
33 32 {
34 33 [super viewWillAppear:animated];
35 34 self.navigationController.interactivePopGestureRecognizer.enabled = NO;
  35 + self.navigationController.navigationBarHidden = YES;
36 36  
37 37 }
38 38  
... ...
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
  View file @6cd4983
... ... @@ -384,7 +384,7 @@ static CGFloat moveHeight = 50;
384 384 }
385 385 // 登录
386 386 - (void)loginAction:(UIButton *)sender {
387   -
  387 + [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC];
388 388 }
389 389 #pragma mark - Method
390 390 - (NSInteger)containsWithChannelId:(NSString *)channelId {
... ... @@ -431,6 +431,9 @@ static CGFloat moveHeight = 50;
431 431 } else {
432 432 weakSelf.topBgImgHeight = kStatusHeight+100;
433 433 }
  434 + if (weakSelf.topBgImgHeight<kStatusHeight+100) {
  435 + weakSelf.topBgImgHeight = kStatusHeight+100;
  436 + }
434 437 weakSelf.topBgImg.height = weakSelf.topBgImgHeight;
435 438 weakSelf.topBgImg.bottom = kStatusHeight+100;
436 439 weakSelf.myCategoryView.bottom = weakSelf.topBgImg.height-60;
... ... @@ -809,6 +812,7 @@ static CGFloat moveHeight = 50;
809 812 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
810 813 NSLog(@"%@", NSStringFromSelector(_cmd));
811 814 UIViewController *vc = self.controllersArr[index];
  815 + vc.navigationController.navigationBarHidden = YES;
812 816 if (index>self.ld_currentIndex) {
813 817 [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
814 818 }else
... ...